cache the values looked up from BABL_ERROR and BABL_PATH_LENGTH

* babl/babl-fish-path.c: (legal_error), (max_path_length): cache the
values looked up from BABL_ERROR and BABL_PATH_LENGTH environment
variables, changed default maximum conversion path length from 3 to 4.

svn path=/trunk/; revision=219

diff --git a/ChangeLog b/ChangeLog
index 5e575b8fb6638855d624fbb6aae1a6f12a6d0925..fcbf9c19017e186a419d54e74bb66c2d6f9512de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-16  Øyvind Kolås  <pippin@gimp.org>
+
+       * babl/babl-fish-path.c: (legal_error), (max_path_length): cache the
+       values looked up from BABL_ERROR and BABL_PATH_LENGTH environment
+       variables, changed default maximum conversion path length from 3 to 4.
+
 2007-02-16  Øyvind Kolås  <pippin@gimp.org>
 
        * babl/base/formats.c: (babl_formats_init): specify Y'CbCrA model

diff --git a/babl/babl-fish-path.c b/babl/babl-fish-path.c
index 8e1d9fa796c140b5d465ff22b0fdca1572c0a48c..3dc99b3ad4bbb3441c3699dbae871e7990adccd7 100644 (file)
--- a/babl/babl-fish-path.c
+++ b/babl/babl-fish-path.c
@@ -31,28 +31,36 @@ chain_error (Babl            *fmt_source,
 
 static double legal_error (void)
 {
-  double error=0.00000001;
+  static double error=0.0;
   const char *env;
 
+  if (error != 0.0)
+    return error;
+
   env=getenv ("BABL_ERROR");
   if (env)
     error = atof (env);
-  else if (error<=0.0)
-    error = 0.0;
+  else 
+    error = 0.000001;
   return error;
 }
 
 static int max_path_length (void)
 {
-  int         max_length=3;
+  static int  max_length=0;
   const char *env;
 
+  if (max_length != 0)
+    return max_length;
+
   env=getenv ("BABL_PATH_LENGTH");
   if (env)
     max_length = atoi (env);
-  if (max_length>BABL_HARD_MAX_PATH_LENGTH)
-    max_length=BABL_HARD_MAX_PATH_LENGTH;
-  else if (max_length<=0)
+  else
+    max_length = 4;
+  if (max_length > BABL_HARD_MAX_PATH_LENGTH)
+    max_length = BABL_HARD_MAX_PATH_LENGTH;
+  else if (max_length <= 0)
     max_length = 1;
   return max_length;
 }